Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge issue #260

Merged
merged 29 commits into from
May 2, 2019
Merged

Merge issue #260

merged 29 commits into from
May 2, 2019

Conversation

afender
Copy link
Member

@afender afender commented May 1, 2019

No description provided.

afender and others added 29 commits April 25, 2019 13:50
@afender
Updated test paths
2a9c3eb
@afender
added a script to get test datasets from s3
dee078c
@afender
added readme for datasets
ebedef5
@afender
Update README.md
237d265
@afender
improved the s3 script to set the dataset path
fb0217a
@afender
Merge branch 'cpp_test_datasets' of github.com:afender/cugraph into c…
f25b128 
…pp_test_datasets
@afender
Update README.md
b64b192
changelog remove extra new line
526ff8c
changelog
5c05049
@afender
changing tar.gz to tgz
a847327
@afender
Merge branch 'cpp_test_datasets' of github.com:afender/cugraph into c…
4db0b31 
…pp_test_datasets
Merge remote-tracking branch 'upstream/branch-0.7' into localbuild
54b85b5 
Get gpuci update
Update CONTRIBUTING
1e01f70
Add local build script
2f5a018
@afender
Updated the main readme
8b37c21
Add style check example
90dd4f0
Remove extra character in README
9fea2dd
@afender
Merge branch 'branch-0.7' into cpp_test_datasets
c958b6d
@afender
Update CHANGELOG.md
d61a6b1
@ChuckHastings
add rmm to the conda configuration
294cfc2
@ChuckHastings
update changelog
55f08e3
@ChuckHastings
try the technique cudf is using for managing conda environment
ad5ddf8
@BradReesWork
Merge pull request rapidsai#250 from dillon-cullinan/localbuild
afac161 
[REVIEW] Local build script to mimic gpuCI
@BradReesWork
Merge pull request rapidsai#252 from afender/cpp_test_datasets
e27af17 
[review] cpp test upgrades for more convenient testing on large input
@BradReesWork
Merge pull request rapidsai#253 from ChuckHastings/bug_add_rmm
5e21bc7 
[REVIEW] Add rmm to the conda configuration
@ChuckHastings
add pip to the install, remove nightly files, update readme
109252c
@ChuckHastings
update CHANGELOG
98414b4
@afender
Merge pull request rapidsai#256 from ChuckHastings/bug_add_pip
7b47256 
[review] add pip to the install, remove nightly files, update readme
@afender
Merge remote-tracking branch 'upstream/branch-0.8' into merge_issue
7dbf41e
@afender afender closed this May 1, 2019
@afender afender reopened this May 1, 2019
@afender
Copy link
Member Author

afender commented May 1, 2019

I think we should ignore the changelog error as I didn't edit anything (there was no merge conflict when I used the command line). Editing it would be room for further merge problems.

@BradReesWork can you please try to delete branch0.8tmp? Somehow I was able to create it and do one push in it but it got locked, I cannot push anything or delete it anymore (I created this PR from my fork instead).

@afender afender requested a review from BradReesWork May 1, 2019 21:21
BradReesWork
BradReesWork approved these changes May 2, 2019
View reviewed changes
Copy link
Member

@BradReesWork BradReesWork left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the ChangeLog will need to be updated later

CHANGELOG.md
@@ -8,7 +8,7 @@
- PR #210 Expose degree calculation kernel via python API
- PR #220 Added bindings for Nvgraph triangle counting
- PR #234 Added bindings for renumbering, modify renumbering to use RMM

- PR #250 Add local build script to mimic gpuCI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be in a new Release 0.8 section

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the same for the Improvements and Bug Fixs

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so these are 0.7 changes that were already merged in 0.7.
Recall that this PR is just manually doing what 0.7->0.8 integration that GitHub couldn't do automatically.

@BradReesWork BradReesWork merged commit b9bded3 into rapidsai:branch-0.8 May 2, 2019
@afender afender mentioned this pull request May 2, 2019
Closed
@afender afender deleted the merge_issue branch July 16, 2019 17:54
ChuckHastings pushed a commit to ChuckHastings/cugraph that referenced this pull request Jun 14, 2021
@ajschmidt8
pin dask versions in CI (rapidsai#260)
21b38dd
ChuckHastings pushed a commit to ChuckHastings/cugraph that referenced this pull request Jun 14, 2021
@ajschmidt8
Revert "pin dask versions in CI (rapidsai#260)" (rapidsai#264)
6c02b59 
This PR reverts the pins that were made in rapidsai#260. Those changes were only needed for the `21.06` branch.

Authors:
  - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Dillon Cullinan (https://github.com/dillon-cullinan)

URL: rapidsai/raft#264
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BradReesWork BradReesWork BradReesWork approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@afender @BradReesWork @ChuckHastings